3.6.1 release and documentation updates
Merge branch 'release/3.6.1'
Merge tag '3.6.1' into develop

Version 3.6.1