preparation for upcoming release (updating files)
Merge branch 'develop' into release/skytools_3_1_5
v3.1.5
Merge branch 'release/skytools_3_1_5'
Merge remote-tracking branch 'gamato/master'