Merge 4.0.10 into releases
authorStephen Sinclair <sinclair@music.mcgill.ca>
Fri, 11 Oct 2013 00:04:03 +0000 (02:04 +0200)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Fri, 11 Oct 2013 00:04:03 +0000 (02:04 +0200)

Trivial merge