Sync'd branch integration/inbound with upstream @ Wed Oct  8 06:59:42 PDT 2014