Version 0.13.2
Merge branch 'master' into noswf