Sync'd branch integration/inbound with upstream @ Wed Oct  1 18:24:41 PDT 2014