merge from RC [release 1.1.8]
25 May 06 Alex 4712
08 May 06 kostja 4569
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.