Merge tag 'keys-preparse-1-20140722' into keys-next