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