Pushing new changes
Updated
Merge branch 'master' into pull_safetypin_20141114032833083
Updated