Merge branch 'hotfix/20130319'
Merge branch 'master' into develop
Merge branch 'develop' of github.com:scholarslab/prism into develop