Merge remote-tracking branch 'kanzure/master' into nuke-globals
Merge remote-tracking branch 'kanzure/master' into nuke-globals
compare.sh: diff -u
Move includes into object bases instead of their version wrappers.
Merge pull request #230 from yenatch/master

the calm before the storm