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