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