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

Trivial merge