Merge branch 'master' of github.com:reflectometry/igor.py