Merge branch 'master' into feature/six-1.4.1. Closes #122.