Merge branch 'release/20140809-1916'
Merge tag '20140809-1916' into develop

release tag