Merge branch 'master' into zhg_mnist_keras_engine