JC: added style.
JC: removed lock.
Merge branch '3.2.12.01' of github.com:emclab/fixed_task_projectx into 3.2.12.01