Merge pull request #1095 from shackbarth/masterref