Merge tag '20141119075009' into develop

milestone: 20141119075009 20141119075009
fpm
Merge branch 'release/20141119081119'