Merge branch 'master' of github.com:xamarin/Xamarin.Forms
authorE.Z. Hart <hartez@gmail.com>
Thu, 17 Nov 2016 23:00:42 +0000 (16:00 -0700)
committerE.Z. Hart <hartez@gmail.com>
Thu, 17 Nov 2016 23:00:42 +0000 (16:00 -0700)

Trivial merge