Fix for ORION-415 #resolve
Merge branch 'master' of github.com:openskye/openskye