Merge latest trunk changes into this branch.
commit2e32cc5af1f7a19e2e115ecf81fe305543fa0d06
authorDan Kennedy <danielk1977@gmail.com>
Tue, 22 May 2018 20:36:12 +0000 (22 20:36 +0000)
committerDan Kennedy <danielk1977@gmail.com>
Tue, 22 May 2018 20:36:12 +0000 (22 20:36 +0000)
tree7527084b49457c7198ad575af2cc7b077420ba6f
parentda06ac64a743328a88709b67db1d5b649e381304
parentb70fcefd5d9cc4f28b1fed055c7eb1afe1025232
Merge latest trunk changes into this branch.