Merge branch 'refs/heads/develop'
Toolbar title background should support being inactivatable on Mountain Lion too, and be "control" on JDK 6
Merge branch 'refs/heads/master' into develop