upstream/1.0_git20170606
bd634c89 · changes to remove test error and warnings during compilation ·