Code review 2014-06-16