Yay, custom message!
Merge sharelatex-2014-10-02-1346 into master