Sync'd branch integration/inbound with upstream @ Thu Oct  2 08:23:37 PDT 2014