Friday Pull Request

@truffaut @sdevani