Merge branch 'log-scale' into 'ndscope-log-scale'

# Conflicts:
#   ndscope/crosshair.py
#   ndscope/cursors.py
#   ndscope/plotMenu.py
3 jobs for ndscope-log-scale in 4 minutes and 11 seconds (queued for 2 seconds)