Fix form snafu
Merge branch 'idealab' into develop