Merge remote-tracking branch 'remotes/rth/tags/pull-axp-201508018' into staging