MagLev/maglev — pull request #256 by timfel (2013-02-03 14:46:09+00:00)
Title: Merge master to 1.9

Includes changes that should be available in 1.9 also