sin estatus 6
Merge branch 'lyzmar' into pre-master