Fixed capturing internal links.
Fixed layout/rerender problems when data is not completely available yet.
Merge branch 'release/2013-04-13'