Sync'd branch integration/inbound with upstream @ Wed Oct 22 08:40:46 PDT 2014