Merge tag '20140809-1916' into develop

release tag
CleanUp
Merge branch 'release/20140810-0938'