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