Mark's 20141111-* patches from #10793