Merge remote-tracking branch 'remotes/rth/tags/tcg-pull-20150313' into staging