Merge axis-dev into master

Done developing on axis-dev (for now).