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