Merge branch 'hotfix/#89'
Merge branch 'hotfix/89' into develop
mod README.md
Merge branch 'release/2013.05.10' into develop