general
Merge branch 'lyzmar' into pre-master