Needed because of customer demo

Closed Sid Sijbrandij requested to merge secure-demo into master