squash unstable branch to version 2014.7.12-2. see README.md for changes