Sync'd branch integration/inbound with upstream @ Wed Oct  1 11:42:39 PDT 2014