drakosfire's picture
Removed some duplication from merge
6990ec5