Update sort from master

This commit is contained in:
Automated Commit 2016-12-30 07:00:21 -05:00
parent 5948dce66d
commit 32364252a0

@ -1 +1 @@
Subproject commit 18bb45535ab4ed5c0c1280e0f0e094c0c050a7aa
Subproject commit a012636dad7de47cff75a7f381c0d1f940191075