Merge branch 'master' into nozlib

* master: (29 commits)
  translation update
  Remaining plugin translations for Welsh (cy)
  Partial Plugin Translation for Welsh
  translation update
  translation update
  Translation of main php lang file: CY
  translation update
  Translation files
  Translation files
  Translation 2
  Translation
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  PHP 7 is no longer allowed to fail
  Fixed bug in obtainLock(), where it always fails to verify the lock. This fixes #1019, fixes #1311
  translation update
  ...

Conflicts:
	.travis.yml