Updating copyright headers, preparations for next release.
Merge branch 'development' into portable