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

Trivial merge