Merge branch 'universal-planes2' of git://github.com/jsarha/kmsxx