Sync'd branch integration/inbound with upstream @ Thu Oct 30 01:17:34 PDT 2014