Pushing new changes
Merge branch 'master' into pull_cmanners_20140324104236337
Updated