closes #256
Merge remote-tracking branch 'upstream/master' into devel-1.4.9