Merge from openjk/master