Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-19 dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c

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