Changed file name from locale.xml to application-context.xml.
Merge remote-tracking branch 'origin/master'