6d46de7 Cleanup merger

Authored and Committed by corsepiu 8 years ago
    Cleanup merger