Merge devel into master and roll back to 0.7 meteor version