Merge branch 'hotfix/20140430-whites'
Gunslinger Stratos
Merge branch 'hotfix/20140430-gsblogk' into develop