Merge: binary clock changes

latest commit e41af74e30
@MarkAdamson authored