Merge tag '20141117184118' into develop

milestone: 20141117184118 20141117184118
mask
Merge branch 'release/20141117184547'