Import upstream 2.3-current-2013-10-16