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