Merge branch dynamics of github.com:landakram/hopper