Update sort from develop

This commit is contained in:
Automated Commit 2017-11-24 08:00:17 +00:00
parent 22c10c041b
commit 37d647b5c1

@ -1 +1 @@
Subproject commit 148fa7153026d00829bdc88a95fcdccfd67b3a8f
Subproject commit 4367cadfd1bdc02008256df03aed7a49b7295e3a