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