checkpoint 2013-08-13
Merge branch 'master' of ssh://github.com/ilastik/ilastik-meta
checkpoint 2013-08-22