Update for compatibility with dplyr 0.3