code drop based on:
commit fd028a1f4742146e8f9a475b8efdc7febbd88a1e
Date:   Tue Jan 22 17:30:01 2013 +0100
Merge branch 'codedrop-input'