Merge branch '2014_null_directory'