Merge branch 'master' of https://github.com/t20100/pymca
GL: Fix addImage scale check
Merge remote-tracking branch 'upstream/master'