Fixed GIT-bug.
Merge branch 'master' into Stellan_Dev