Merge branch 'master' of https://github.com/XSCE/xsce

get in sync with upstream
Merge branch 'master' of https://github.com/georgejhunt/xsce

What did I put in github that this machine does not know about?