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