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

Trivial merge