Merge branch 'ryan'
Merge branch 'master' into ryan