Sync'd branch integration/inbound with upstream @ Thu Oct 30 05:51:33 PDT 2014