Merge "Fountain example cleanup. Remove compatability versions of rsg functions that took old 'i' types."