openmicroscopy/openmicroscopy — pull request #1067 by jburel (2013-04-19 09:25:39+00:00)
Title: Mixed 1061 1064

This PR combines #1061 and #1064. Only for FS demo 3 purpose.