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