Merge remote-tracking branch 'remotes/rth/tags/pull-tile-20151007' into staging