Merge branch master into rorcz
commit73c424d332c0fe1a7031b7e82686ef74c52457f4
authorKyle J. McKay <mackyle@gmail.com>
Fri, 19 Aug 2016 02:27:43 +0000 (18 19:27 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Fri, 19 Aug 2016 02:27:43 +0000 (18 19:27 -0700)
treeb97853a8d125d669ea1ae1d13d3dd5776edbe01b
parentad1482429e0d9c45e8671caa51e5729ccc92663a
parent5dce530d69b562ed2a06dd52f1aa5f68055c2f46
Merge branch master into rorcz