Merge "Fix night/notnight resource folder handling." into gingerbread