Restore version to 'trunk'. #1177