Merging branches/0.2/@r859 with trunk