Fixed errors when automatically generated stos files are missing and manual input should be used.
Merge branch 'origin/master'