Merge files from develop

latest commit ffcccb0c51
@gdolle authored