Sync'd branch integration/inbound with upstream @ Thu Oct 30 08:08:54 PDT 2014