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