Sync'd branch integration/inbound with upstream @ Wed Oct  1 04:49:49 PDT 2014