Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-17 522bede75fce4a0e3a7d2c7eff1eee198b900a22

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