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