Merge changes from GtkRadiant repo into fork