Merge branch 'fix-db-stats' into 'stable-3.1'

Till Brehm

2016-06-16 8225ad2d0778160477c5b23e6fc14d608578b796

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