[Bigbang-dev] Merging in DMI Summer School Changes