Merge remote-tracking branch 'remotes/oldcasmi/master'
Authored by: sneumann 2012-07-19
Parent: [r1]
Child: [r3]