Directory structure.
Merge branch 'release/2014.05.17.1'