squash unstable branch to 2014.5.26-4. see README.md for changes