ImageEngine/cortex — pull request #312 by valeriebernard (2014-07-16 16:47:50+00:00)
Title: 8 maintenance

Merging my latest 8_maintenance changes into master