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