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