Merge remote-tracking branch 'upstream/develop' into 1659-sort-thumbnailviewer

This commit is contained in:
millmanorama 2017-05-15 12:41:15 +02:00
commit c72806bd50

Diff Content Not Available