Develop

merge from develop into master, to bring master up to speed with the most current developments.