Merged from Bitbucket http://goo.gl/Ge8s9 and IL-2 Horus Commander http://goo.gl/zc7gK