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