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