Sync'd branch integration/inbound with upstream @ Wed Oct 29 11:16:41 PDT 2014