- Reverted incomplete experimental code
Merge branch 'master' into 64bitIn32Bit