~ dialogs
# merged with master