Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-26 6028e4692d172b63f8af79c4460f9dbff5a9a01c

1
ALTER TABLE `directive_snippets` ADD `master_directive_snippets_id` int(11) unsigned NOT NULL DEFAULT '0' AFTER `active`;