sync'ed with Armadillo's SVN and Armadillo 4.100.1