Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Only add exception-handler if needed
Output nice errors
Upgraded to CKFinder 2.3.1
Upgraded to CKEditor 3.6.6
Correct version
Merge remote-tracking branch 'upstream/master'
Use the email-type for the input field
Use the email-type for the input field
Merged master