Merge branch 'master' into bekaus_mac
Merge branch 'mac_os' of github.com:bekaus/pgmlink into bekaus_mac
Merge branch 'ilastik_mac' into bekaus_mac
Merge branch 'mac_os' into bekaus_mac
Merge branch 'mac_os' of github.com:bekaus/pgmlink into bekaus_mac