Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: If91df360190468d97d8ee14cb9167d030520b6b5
Updating version to 3.98.1-enhanced.

Change-Id: I42478f6da51c7bf7492724e1fa8d5f40e36dfb95
Merge topic '0013752-move-selection-toolbar-above-3d-view' into next

25274cc Making UndoRedo7 use the EditMenu functions.
2fc9d62 Fix test failing due to selection move to 3D-View.
b52d4ec Deleting SelectionToolbar and references.
efe5a43 Moving buttons from Toolbar into 3D-View.
Merge topic 'update_version_to_3.98.1-enhanced' into next

edea228 Updating version to 3.98.1-enhanced.