Merge branch #keithproject/hermes' into 'keithproject/vanguard' ad67207 keithproject commited on Aug 26
Merge branch #keithproject/hermes' into 'keithproject/vanguard' e4bc644 keithproject commited on Aug 21