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