MatthewHeun Merge branch 'release-0.4.15'