idrc/tecla-framework — pull request #362 by k22mak (2013-07-31 21:32:24+00:00)
Title: Fixes merge conflicts for issue #346 (pull request #347)

This will replace merge request #347 that fixes issue #346.