Possible keybinding to switch to previous workspace.
Disabled at default.
Remove new keybinding from 69b7a0ad9277f21ad761c84ac1bae5455a2f879e

The key never existed in mateconf so there is no need to convert.
Remove all trailing whitespaces in the code tree

Just run:
 $ find -name '*.c' -print0 | xargs -r0 sed -e 's/[[:blank:]]\+$//' -i
 $ find -name '*.h' -print0 | xargs -r0 sed -e 's/[[:blank:]]\+$//' -i
Merge remote-tracking branch 'upstream/master'