--- buildbot/status/web/waterfall.py.orig	2015-04-21 00:53:41.000000000 -0500
+++ buildbot/status/web/waterfall.py	2016-08-06 11:19:40.000000000 -0500
@@ -325,6 +325,7 @@
         for bldr in builders:
             tags = bldr.getTags()
             allTags.update(tags or [])
+        allTags = util.naturalSort(list(allTags))
         cxt['show_tags'] = show_tags
         cxt['all_tags'] = allTags
 
@@ -585,7 +586,7 @@
         for builderName in builderNames:
             builder = status.getBuilder(builderName)
             tags.update(builder.getTags() or [])
-        tags = sorted(tags)
+        tags = util.naturalSort(list(tags))
         ctx['tags'] = tags
 
         template = request.site.buildbot_service.templates.get_template("waterfall.html")