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