merge from lp:openpetraorg/20130115_replace_net_remoting