squash unstable branch to v2014.5.20-1