gcc4.8.1 build break
gcc4.8.1 build break
Merge pull request #435 from Juniper/gcc4.8.1

gcc4.8.1 build break