Merge branch 'master' into chain-left-biphone

egs/hkust/s5/local/nnet/run_cnn.sh

egs/rm/s5/local/nnet/run_cnn.sh

egs/rm/s5/local/nnet/run_cnn2d.sh

egs/rm/s5/local/nnet/run_multilingual.sh

egs/swbd/s5b/local/nnet/run_dnn_tandem_uc.sh

egs/swbd/s5c/local/nnet/run_dnn_tandem_uc.sh

egs/wsj/s5/steps/nnet/train.sh

egs/wsj/s5/steps/nnet/train_mmi.sh

egs/wsj/s5/steps/nnet/train_mpe.sh

egs/wsj/s5/steps/nnet/train_scheduler.sh

egs/wsj/s5/utils/convert_slf_parallel.sh

egs/wsj/s5/utils/split_scp.pl

src/base/kaldi-utils.h

src/cudamatrix/Makefile

src/cudamatrix/cu-array-inl.h

src/cudamatrix/cu-array.cc

src/cudamatrix/cu-array.h

src/cudamatrix/cu-kernels-ansi.h

src/cudamatrix/cu-kernels.cu

src/gmm/am-diag-gmm.cc