Merge branch 'develop' into 'master'

Add Eyüp's changes from CNNArch2MXNet

See merge request !2
Status Job ID Name Coverage
  Windows
canceled #397265
Windows10
masterJobWindows

 
  Linux
canceled #397266
BranchJobLinux