Version 3.6.1

Ready to merge changes made since version 3.6.