Sync'd branch integration/inbound with upstream @ Wed Oct 29 14:39:46 PDT 2014