Fix build on Lugano puppetized nodes
Merge pull request #85 from eile/master

Fix build on Lugano puppetized nodes
Merge remote-tracking branch 'origin/master' into appmain

Conflicts:
	src/core/Movie.cpp

Change-Id: I24d18db8d820f82d7b7ce6e4d4e302640e29b380