Sync'd branch integration/inbound with upstream @ Wed Oct 29 12:11:49 PDT 2014