fixed #608, #610
Merge remote-tracking branch 'origin/master' into slider_range_one