Minor changes
Merge remote-tracking branch 'trunk/master'
New F and Mg-sp