Merge branch 'bleeding-jumbo' of https://github.com/bwall/JohnTheRipper into bleeding-jumbo

* 'bleeding-jumbo' of https://github.com/bwall/JohnTheRipper:
  Updated copyright information
  Applied code review changes from magnum and increased the plaintext size to 23

Conflicts:
	src/opencl_pwsafe_fmt.c

Conflict from Claudio's recent patches were merged manually.