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