Added an important note to the maintainers.txt file
Eh, thought better of it ;)
Merge branch 'master' into development