Sync'd branch integration/inbound with upstream @ Thu Oct 16 19:23:40 PDT 2014