istream::operator bool() is explicit in C++11, use git diff
Merge branch 'master' of https://github.com/stepmania/stepmania