Fix Subforms Regressions

Signed-off-by: Kevin Nguyen <k.nguyen@thecodingmachine.com>
Merge branch '3.1' of git://github.com/thecodingmachine/mvc.bce into 3.1
Signed-off-by: Kevin Nguyen <k.nguyen@thecodingmachine.com>