Merge branch 'marching-squares-bug' into 'master'

Fixing states 5 and 10 to ensure clock-wise walk.

See merge request !40
7 jobs for master in 7 minutes and 5 seconds (queued for 2 seconds)
Name Stage Failure
failed
mac_llvm_testing Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
mac_gcc_testing Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log