Core : PR # 131
Merge branch 'master/dubrovka' of git://github.com/novius-os/novius-os into master/elche