Updates from ShareLaTeX
Merge sharelatex-2014-12-31-0156 into master