fixed linker error for gcc 4.8.1 under linux
Merge commit '0d69c32e9f2b9d8820659a233ffa9df3d06b8044'
Merge branch 'master' into file-io