Merge remote-tracking branch 'refs/remotes/origin/master' into Detection

This commit is contained in:
FlightControl
2016-07-23 10:38:15 +02:00
61 changed files with 1148 additions and 316 deletions