Adds buffered logging
Merge branch 'release/2014-12-03_3'