Merge branch 'master' of git://github.com/alexrj/slic3r into feature-xs-types