Merge Rf12mods into master