Merge branch 'master' of https://github.com/flyway/flyway

Conflicts:
    flyway-core/src/main/java/com/googlecode/flyway/core/dbsupport/SqlScript.java