Merge remote-tracking branch 'chiiph/bug/path_prefix' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 30 Jul 2013 14:50:30 +0000 (11:50 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 30 Jul 2013 14:50:30 +0000 (11:50 -0300)

Trivial merge