Fixed something that got broken in the merge :(
Merge branch 'hotfix-0.6.4' into develop
upgraded rack-ssl
Merge branch 'master' into develop
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop