Sync'd branch integration/inbound with upstream @ Wed Oct  8 14:54:03 PDT 2014