Merge branch 'master' into msb/aspect-ratio
authorMichael S. Barthelemy <msb@idiom.com>
Thu, 16 Jul 2015 17:57:38 +0000 (13:57 -0400)
committerMichael S. Barthelemy <msb@idiom.com>
Thu, 16 Jul 2015 17:57:38 +0000 (13:57 -0400)

Trivial merge