ET 99 + CR 84 + OW 117 + TP 13 + MC 131 + Misc
Merge branch 'master' of https://github.com/Chain-Reaction/NRaas