2013-02-03: remerge over different machine