Merge branch 'javafx' into master