Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
58 changed files with 6498 additions and 735 deletions

File diff suppressed because it is too large Load Diff