Merge hastebrot:master into TestFX:master