Sync'd branch integration/inbound with upstream @ Wed Oct  1 10:40:36 PDT 2014