Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging