Sync'd branch integration/inbound with upstream @ Wed Oct 29 01:23:10 PDT 2014