Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

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