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