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