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

milestone: 20141117184547 20141117184547