v4.0.4_rc1
build-sys: Relocate lib/
misc: eliminated some instances of trailing whitespace
Fix test for double test