More sophisticated negative double
Merge branch 'newmodules'
Merge branch 'master' into jeff-norman
newline
Merge branch 'newmodules' into jeff-norman
merge