Merge pull request #125 from jcarpent/devel

Improve conversion checking
16 jobs for devel in 8 minutes and 36 seconds (queued for 2 seconds)