master merge

diff --cc CHANGELOG
index 1ec254cac68d751456835f75978bc2436c0256b2,25753dab822ed5ce7672a2910820e7dbe701fd03..e4f927402fe1ac5625a49dea0c287cdc3012859e
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,9 +1,9 @@@
- 202008xx version 1.2 Carbon
+ 202100321 version 1.3 Nitrogen
+ * Added new default allowed file types
+ * Cleanups
+ 
+ 20200814 version 1.2 Carbon
 -* Cleanup version only. No new fetures
 +* Cleanup version only. No new features
  
  20200530 version 1.1 Boron
  * House cleaning