Merge branch 'master' into 'master'

Ingrid tests making a change to master through fork

See merge request ctdas/CTDAS!6

da/test/test_optimizer.py

@@ -21,6 +21,9 @@ File created on 04 Aug 2010.
 
 """
 
+print("Ingrid is testing git here")
+
+
 def serial_py_against_serial_fortran():
     """ Test the solution of the serial algorithm against the CT cy2 fortran generated one """