Unify master and shiny.