Merge commits from stympy:master into sgabler:master