Merge branch 'minimal' into swig
Merge branch 'swig'