Sync'd branch integration/inbound with upstream @ Wed Oct  1 17:22:43 PDT 2014