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