Sync'd branch integration/inbound with upstream @ Thu Oct 30 13:21:46 PDT 2014