Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus

This commit is contained in:
Michael Vogel 2015-01-12 20:49:00 +01:00
commit 7d34648373

Diff Content Not Available