finished initial scaler
Merge branch 'release/20140414.0'