refs #1040

@lukebuehler can you please rebase your branch onto the upstream dev branch?

@adamralph done

@adamralph oh crap, did I just mess up the rebase?

I'm mobile right now, but I'll take a look asap. The easiest thing to do to
avoid these kinds of problems is to always commit to a branch off dev,
rather than dev itself.

On 16:05, Fri, 8 May 2015 Lukas Buhler notifications@github.com wrote:

@adamralph https://github.com/adamralph oh crap, did I just mess up the
rebase?

—
Reply to this email directly or view it on GitHub
#1041 (comment).

It looks like you did a merge instead of a rebase.

Not to worry, I'll cherry pick your commit and merge it manually.

As I say, for future ref, if you always work off a feature branch, you'll avoid this problem.

Instead of merging manually I raised another PR containing your commit - #1042