Merge 2.1 into releases
authorStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 21:55:47 +0000 (23:55 +0200)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 21:55:47 +0000 (23:55 +0200)

Trivial merge