Updated .pot and .po/.mo Files
Merge branch 'upstream-master'
Merge branch 'master' into fixes-20130324