Merge branch 'systempreferences' into 'master'