Merge branch 'master' into jebeck/tideline-plugins