Pushing new changes
Merge branch 'master' into pull_mangler_20141006111702928