Merge remote-tracking branch 'kwadronaut/develop' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 7 Oct 2014 18:41:06 +0000 (15:41 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 7 Oct 2014 18:41:06 +0000 (15:41 -0300)

Trivial merge