Merge remote-tracking branch 'pl/develop' into oembed_provider
authorrinpatch <rinpatch@sdf.org>
Fri, 25 Jan 2019 07:40:51 +0000 (10:40 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 25 Jan 2019 07:40:51 +0000 (10:40 +0300)

Trivial merge