Sync'd branch integration/inbound with upstream @ Wed Oct 29 09:17:39 PDT 2014