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