Sync'd branch integration/inbound with upstream @ Wed Oct 15 03:59:40 PDT 2014