v1.5.0 from sourceforge
Merge remote-tracking branch 'origin/master'