fixed handling of nil trunks
upped version to 1.10.4
Merge branch 'develop' into to_actions2
Merge branch 'to_actions2' into obj_render
Merge branch 'obj_render' into json_xml
Merge remote-tracking branch 'gerry/to_actions' into develop
Merge branch 'develop' into obj_render
Merge branch 'obj_render' into json_xml
Merge develop forward