Merge branch 'develop' of github.com:semaphoreui/semaphore into develop