Merge pull request #1043 from Diapolo/misc