Merged GSoc2013 MateY-IndentEngine branch from Matej Miklečić
<matej.miklecic@gmail.com> manually.