Merge branch 'release/1.3.9' into develop
final cleanup. moved package data down under extra.
bump
Merge branch 'release/1.3.10'