Merge remote-tracking branch 'upstream/dev' into dev

src/scripts/Profiles/Atom.txt

@@ -1,3 +1,4 @@
-sampling=1,1,1,1,1,1,1,0,8,0,1
-geometry=48,11,304,240,304,240,0,8,7159090,456,0,262,4,0
-palette=17
+sampling=1,1,1,1,1,1,1,0,8,0,0
+geometry=60,11,304,240,304,240,3,8,7159090,456,0,262,4,0
+input_mux=1
+palette=8

src/scripts/Profiles/Atom_CPLD.txt

@@ -1,3 +1,3 @@
 sampling=1,1,1
-geometry=40,11,304,240,608,480,0,8,7159090,456,0,262,4,0
-palette=14
+geometry=40,11,304,240,304,240,3,8,7159090,456,0,262,4,0
+palette=8