Consolidating branches and bumping version #.
Merge branch 'release/0.3.9'