Merge branch/2014-05-17/chunk-tree into the master sources.