Merge branch 'master' into 'ba_celik'

# Conflicts:
#   src/main/resources/templates/gluon/CNNNet.ftl
1 job for ba_celik in 2 minutes and 10 seconds (queued for 2 seconds)