Clone BasicFlag, adapt with pre-calculated flags
Merge branch 'derk' into janjelle-link
Fix Java 6 compilation issue for BitSet2
Fix BitSet2 contains method
Add dummy flag
Merge remote-tracking branch 'origin/janjelle-link' into derk