Merge branch 'ryan'