Made executable (execute permissions were lost during a copy.
Merge branch 'dev' into test