Bump master to 2.1 alpha
Merge pull request #479 from SemanticMediaWiki/b

Bump master to 2.1 alpha
Fix #484 / PHPUnit 4.1.5