Merge branch 'master' into windows-min-max-animation
authorFrank Hale <frankhale@gmail.com>
Tue, 11 Nov 2014 18:08:27 +0000 (13:08 -0500)
committerFrank Hale <frankhale@gmail.com>
Tue, 11 Nov 2014 18:08:27 +0000 (13:08 -0500)

Trivial merge