Merge back from develop

I got nothin's better to do's