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