merging branches/0.2/0.2@r44 with trunk