Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20150924' into staging