auto-merge staging into master
auto
auto-merge nightly into master
Updated method props to RFC 7231
Merge remote-tracking branch 'origin/master' into staging