Merge back

Not sure what to do with these? 

Merge back to develop that develop was pulled into master?