fixed installer problems
Merge commit '3cf2d02ad69b7bf59a8349e149a38d90298e8e2a' into devel