Reset ejml-import branch

Merge updates from develop branch.