Merge branch 'master' into 'develop'

# Conflicts:
#   pom.xml
#   src/test/resources/target_code/CNNCreator_Alexnet.py
3 jobs for develop in 5 minutes and 18 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Windows
passed masterJobWindows #629074
Windows10

00:01:43

 
  Linux
passed BranchJobLinux #629089

00:03:35

failed BranchJobLinux #629075

00:02:10