Merge branch 'release/2014_11_22'
Merge tag '2014_11_22' into develop

1.0