Merge master into develop.

types.go

@@ -676,7 +676,7 @@ type InlineQueryResultGame struct {
 	Type          string                `json:"type"`
 	ID            string                `json:"id"`
 	GameShortName string                `json:"game_short_name"`
-	ReplyMarkup   *InlineKeyboardMarkup `json:"reply_markup"`
+	ReplyMarkup   *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
 }
 
 // ChosenInlineResult is an inline query result chosen by a User
@@ -819,3 +819,14 @@ type InputMediaVideo struct {
 	Height   int    `json:"height,omitempty"`
 	Duration int    `json:"duration,omitempty"`
 }
+
+// Error is an error containing extra information returned by the Telegram API.
+type Error struct {
+	Message string
+	ResponseParameters
+}
+
+// Error message string.
+func (e Error) Error() string {
+	return e.Message
+}