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

milestone: 20141118083552 20141118083552