Merge remote-tracking branch 'ben/next' into shellcheck_fixes

pull/22/head
Dominik Ritter 9 years ago
commit fc80f0c4d8

Diff Content Not Available