Merge topic 'settings-15161'

cbca6e4c Fix warning.
c3bab35c FIX: Edit / Settings / General / DefaultTimeStep works.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I1f364608e1ee9f278937ca0f27887936ecb8204c