combined pull requests #59 #57 #31#63

ell1010 wants to merge 2 commits into

kragen:masterkragen/xcompose:masterfrom

ell1010:masterell1010/xcompose:masterCopy head branch name to clipboard