Merge branch 'release/2014'
https
Merge branch 'hotfix/ssl' into develop