Merge branch 'ratson-master'