Convert three dots to ellipses (Eclipse told me to)
Merge branch 'master' into mock