Alex's changes accepted.
Merge branch 'mergebranch'