Merge remote-tracking branch 'remotes/rth/tags/pull-cap-20171109' into staging