Merge branch 'hotfix/0.6.4' into develop
passenger needs to live on edge
Merge branch 'release/0.6.5'