(cherry picked from commit 75833fdb)

Conflicts:
	sdext/source/minimizer/fileopendialog.cxx

Change-Id: I164cc6d9916ddf9dba9da273b5181e5728127292