1.6.0.1 bug fixes.
Merge branch 'dev'