closes #1011
sweetalert #1006
Merge remote-tracking branch 'upstream/master'