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