Sync'd branch integration/inbound with upstream @ Thu Oct 16 03:38:42 PDT 2014