Don't track rails master
Merge branch '2-2-stable'