Merge commit 'a12a896' from precise