Merge branches/gcc-4_8-branch rev 216856