Sync'd branch integration/inbound with upstream @ Wed Oct  1 06:42:42 PDT 2014