Merge with master
Official release of 4.1.0 for Windows and Linux (Java 6)