Merge branch 'release-20140311'
fix solver name
Merge branch 'master' into develop
keep space to be able to copy and paste from PDF