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