Merge commit 'c0dcd45c3ecac33376e06b7ca470ae56f2ed5e19' into cgilite