bug 1236: moved hidden field line
Merge branch 'bug-1236' into testserver-stable