Merged changes from trunk.
Adapted system_information to changes in math.
Authored by: crowbar27 2014-07-13
Parent: [r601]
Child: [r603]