Merge branch 'hotfix/hotfix-1.0.2'
Merge branch 'release/v1.1'
Merge branch 'release/1.2'
Merge branch 'release/1.2.1'
Merge branch 'release/1.2.2'
Corrected the datasource.groovy so it actually works - note this was not
clear from the documentation
Added additional data source configuration
Merge branch 'release/1.2.3'
Merge branch 'release/1.2.4'
Merge branch 'release/1.2.5'
Merge branch 'release/1.2.6'
Merge branch 'release/1.2.7'
Merge branch 'release/1.3.0'
Merge branch 'release/v1.4'
Merge branch 'release/v1.4'
Merge branch 'release/v1.4'
Merge branch 'release/2.0-RC1'
Updated the version number to 2.0
Merge branch 'develop'
Merge branch 'master' into develop