Sync'd branch integration/inbound with upstream @ Wed Oct  1 12:00:40 PDT 2014