Merge changes from ALPHA11 for 1.2.13

This commit is contained in:
Dylan K. Taylor
2018-04-04 11:31:39 +01:00
28 changed files with 415 additions and 283 deletions

File diff suppressed because one or more lines are too long