Updates for Nimbus LAF
Merge pull request #2671 from aengelke/nimbus-fix

Updates for Nimbus LAF