Upstream Merge
Upstream Merge
Merged master fixed conflict.
Google Analytics
Merge pull request #486 from christopherleckie/master

Google Analytics