Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'remotes/origin/1.5' into 1.5
Merge branch 'upstream' into 1.5
Emerald Pipes should remember their state better
Merge remote-tracking branch 'remotes/origin/1.5' into 1.5
Merge remote-tracking branch 'remotes/upstream/master'