Merge branch 'master', remote branch 'origin/master'
Tue Jan  8 18:52:23 MST 2013 - Test cases for encryption/decryption looping