Merge remote-tracking branch 'meskio/feature/cleanup_api' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Mon, 6 Oct 2014 15:57:05 +0000 (12:57 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Mon, 6 Oct 2014 15:57:05 +0000 (12:57 -0300)

Trivial merge