Sync'd branch integration/inbound with upstream @ Wed Oct 15 14:39:43 PDT 2014