Merge 3.0.2 into releases
authorStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 22:03:46 +0000 (00:03 +0200)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 22:03:46 +0000 (00:03 +0200)

Trivial merge