Sync'd branch integration/inbound with upstream @ Wed Oct  8 16:07:40 PDT 2014