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