[RELEASE] Merge from /branches/RELEASE_0_7_0/: