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