Merge branch 'base64-with-linebreaks-slow'
skaufman [Sun, 30 Nov 2014 00:54:09 +0000 (00:54 +0000)]

Trivial merge