Merge branch 'master' into AnnaD15-patch-1

Author: effigies

.mailmap

@@ -36,9 +36,11 @@ Caroline Froehlich <[email protected]>
 Christopher J. Markiewicz <[email protected]>
 Christopher J. Markiewicz <[email protected]> <[email protected]>
 Christopher J. Markiewicz <[email protected]> <[email protected]>
+Christopher John Steele <[email protected]>
 Cindee Madison <[email protected]>
 Colin Buchanan <[email protected]>
 Colin Buchanan <[email protected]> <cbuchanan@cray4.(none)>
+Colin Buchanan <[email protected]> <[email protected]>
 Daniel Brenner <[email protected]>
 Daniel Clark <[email protected]>
 Daniel Geisler <[email protected]>