refs 6741 modified maniefstations display
Merge remote-tracking branch 'origin/master'