Removed libgfortran again and fixed Java home config for Mac OS X
Merge remote-tracking branch 'origin/master'