Merges ripple's settings into master