Merge pull request #86 from it-workshop/wp/CAROLINE-18/1

CAROLINE-18: Fix build dependencies.
(cherry picked from commit f47802803229df4742d78b839d92a80f172c99f0)
Merge pull request #88 from it-workshop/wp-1.0.0/CAROLINE-18/1

Merge pull request #86 from it-workshop/wp/CAROLINE-18/1