Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

1
2
3
4
5
-- -----------------------------------------------------------
-- Dummy patch file
-- Do not edit this file
-- See README.txt in sql folder for detailed instructions
-- -----------------------------------------------------------