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