V1.3.1 - Make the script https capable (cherry-picked from commit b0a9b6888e1c580f581c057c0ca344e20a1c5ea8 by Izzy)
Merge remote-tracking branch 'upstream/master' into oliversalzburg