m23-devel-backup from 2014-12-16 00:20