Sync'd branch integration/inbound with upstream @ Wed Oct 22 10:17:44 PDT 2014