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