Fix for https protocol
Merge branch 'lukaszol-master' into develop