Fix failing script execution thanks to missing folders.
Issue #662.
Merge remote-tracking branch 'upstream/master'