Sync'd branch integration/inbound with upstream @ Wed Oct 29 13:58:40 PDT 2014