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