Latest commit f7816fb Jan 8, 2015 1 nandy-andy reverted my revert and fixed conflicts manually