Merge branch 'feature/db-select-quantifier' of git://github.com/ralphschindler/zf2 into hotfix/3682
Merge branch 'hotfix/3682'

Close #3682
Fixes #3455
Merge branch 'hotfix/3682' into develop

Forward port #3682
Merge commit 'refs/pull/3687/head' of github.com:zendframework/zf2 into hotfix/phpdoc-return-type
Merge pull request #3687 branch 'hotfix/phpdoc-return-type'
Forward #3687
Fix for GitHub issue 3469 - part 2
Zend\Db\Adapter\ParameterContainer
- Fixed ParameterContainer to, upon offsetSet, map int-indexed parameter to named-parameter
Zend\Db\Adapter\ParameterContainer
- Added more tests and a situation for null insertion
Merge branch 'hotfix/3692'

Close #3692
Merge branch 'hotfix/3692' into develop

Forward port #3692
Merge branch 'hotfix/oracle-transaction' of git://github.com/hamilok/zf2 into hamilok-hotfix/oracle-transaction
Merge branch 'hamilok-hotfix/oracle-transaction' into develop
Fix trailing whitespace in Oci8\Connection class
Merge branch 'cs/fixes'
Merge branch 'cs/fixes' into develop
when using a connection 'oci:dbname=test/teste;' the  comes with the value 'Oci'
Amendment preInsert function, values ​​method was cleaning the columns
Restore original travis build

- Restores original travis build script
  - with modification in that it now should use the .php_cs we include
Merge branch 'cs/travis'

Reverted to original travis config as old script format is working again!