Bug fixes from long ago...
Bump to v1.3.6