Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Began changing cat() messages into message() messages
Merge branch 'master' into devel