Revert f8bf37d and try a cleaner fix.
OpenCL Office formats: get_key() bugfix, affecting UTF-8 mode.
Merge git://github.com/magnumripper/JohnTheRipper

Conflicts:
	src/bench.c