Merging branches/0.2/@r849 with trunk