Merged revision 7410 from v0.5.5
Fixed Windows compile with MinGW 4.8.2