This is a branch corresponding to pull request #24.
Merge branch 'hotfix-24' into develop
Merge branch 'hotfix-24'
Hotfix. See issue 29.
Merge branch 'hotfix-29'
Hotfix. See issue 30.
Merge branch 'hotfix-30'
Merge branch 'hotfix-29' into develop
Merge branch 'hotfix-30' into develop
Merge branch 'issue-stoke-36'
Merge branch 'issue-stoke-36' into develop
Merge branch 'master' into berkeley
Merge branch 'develop' into berkeley