fpm
Merge branch 'release/20141119081119'
Merge tag '20141119081119' into develop

milestone: 20141119081119 20141119081119