Added by Sofia Papagiannaki about 12 years ago
Merge branch 'master', remote-tracking branch 'origin' into 0.5