Sync'd branch integration/inbound with upstream @ Wed Oct  8 17:48:55 PDT 2014