Merge tag '1.0.0.201308291130' into develop

1.0.0.201308291130
Changes to support qwt-6.1.0
Merge branch 'release/1.0.0.201308291140'