merge from RC
27 Jun 06 Alex 5289
16 May 06 Alex 4612
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.