Merge branch 'release/2014-12-03_2'
Store duplicate comments
Fixes unit test