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