Nothing but coding style.
Merge branch 'dev'