Update MagLev branch from master-1.9 to master
Merge pull request #508 from johnnyt/maglev

Update MagLev branch from master-1.9 to master