Merge branch 'jcriquet-master'