Merge branch 'master' into fullbinaries
Merge branch 'windows' of https://github.com/convolutedlogic/armadillo.git into windows