09/02/14 Merge

The tree is stable, so merging!