Address Sensiolabs Insight's warning of code cloning.
minor #802 Address Sensiolabs Insight's warning of code cloning. (dericofilho)

This PR was squashed before being merged into the 1.3-dev branch (closes #802).

Discussion
----------

Address Sensiolabs Insight's warning of code cloning.

Commits
-------

470ca5e Address Sensiolabs Insight's warning of code cloning.