Merge remote-tracking branch 'upstream/master'
authorJeremy Carter <Jeremy@JeremyCarter.ca>
Fri, 14 Nov 2014 18:34:15 +0000 (13:34 -0500)
committerJeremy Carter <Jeremy@JeremyCarter.ca>
Fri, 14 Nov 2014 18:34:15 +0000 (13:34 -0500)

Trivial merge