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