Merge pull request #4349 from ricardoquesada/pragma_mark_love

Adds some #pragma mark love
Merge branch 'develop' into constructors_are_protected