Add comment indicating a bug
Merge branch 'master' into ubuntu_13.04