Updated formatting.
Merge branch 'develop'

* develop:
  Updated formatting.