Sync'd branch integration/inbound with upstream @ Thu Oct  9 08:51:48 PDT 2014