seqan/seqan — pull request #315 by holtgrewe (2014-05-02 08:36:13+00:00)
Title: Merging master into develop.

This applies the fix to Mason2 (and Dave's subsequent fix of my patch).