Merge branch 'windows_nifty' into 'NIFTy_7'

Windows nifty

See merge request !655
18 jobs for NIFTy_7 in 33 minutes and 11 seconds (queued for 4 seconds)