A couple of minor bug fixes plus bump revision number
Merge remote-tracking branch 'origin/master' into Pre-process-segmentation-rules