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