Merge branch 'release/20141121214150'
Merge tag '20141121214150' into develop

milestone: 20141121214150 20141121214150