Sync'd branch integration/inbound with upstream @ Wed Oct 29 18:26:38 PDT 2014