Merge "Accept address ranges in r" into honeycomb