List of changes pulled in from master (via #1067): #993 #998 #995 #999 #1001 #1002 #1003 #1004 #1005 #1012 #1011 #1013 #1016 #1014 #1021 #1000 #1020 #1024 #1027 #1033 #1026 #1057 #1054 #1058 #1060 #1063 #1064 #1065 #1066
