New tests for mousetrap unit testing (gtk).
Marking empty directory
Merge remote-tracking branch 'upstream/logan_test'
Merge remote-tracking branch 'origin/darkrose' into ellis