Renamed some variables
Merge branch 'release/2014-02-12.0'