NOBUG mod_surveypro: syncing with github