closes #2030
Merge remote-tracking branch 'origin/master' into 0.5.1