Merge from Drunyacoder/Fapos2.1RC1