Merging branches/0.2/@r857 with trunk