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

Trivial merge