Merge pull request #1038 from Diapolo/misc