Fixed build
Merge commit 'f0219eb'