Resolves #147 for 1.3 branch
Merge branch 'v1.3-maint'
Merge branch 'master' of github.com:atuttle/Taffy