Merge branch 'develop' into fix/theora-detection-read-bytes
authorrinpatch <rinpatch@sdf.org>
Sun, 2 Dec 2018 21:34:04 +0000 (00:34 +0300)
committerrinpatch <rinpatch@sdf.org>
Sun, 2 Dec 2018 21:34:04 +0000 (00:34 +0300)

Trivial merge