Merge from branches/gcc-4_8-branch up to rev 204657.