Merged master into release-1.10 and resolved merge conflicts.

2018-03-13 16:36:07 -07:00
parent 1500d69283 b34babb518
commit 021502d2a6
18 changed files with 183 additions and 258 deletions
@@ -8,6 +8,7 @@ approvers:
 - a-mccarthy
 - abiogenesis-now
 - bradamant3
+- bradtopol
 - steveperry-53
 - zacharysarah
 - chenopis