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