GHC-7.6 compatibility
Merge branch 'master' into ggp

Conflicts:
	src/Generics/SOP/Universe.hs