Merge "Fix FAB, now that ripples framework has changed"