Pushing new changes
Merge branch 'master' into pull_brykmoore_20141008124631415