Taken over last changes from MageSetup repository plus a few text changes