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