Merge changes from riketta/master.