Merge 4.0.0 into releases
authorStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 23:45:59 +0000 (01:45 +0200)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 23:45:59 +0000 (01:45 +0200)

Trivial merge