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