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