Directory structure.
Merge branch 'release/2014.05.17.1'
Merge tag '2014.05.17.1' into develop

Directory structure.