2137: NullPointerException when opening "Edit Styles" dialog
Merge branch '1.3.x'