Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-tcg-plugins-150520...