Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb

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