Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920' * commit '37d1b2496ed4e636062d8bb451e723b975c80920': SIP: convert enum to static final int.
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920' * commit '37d1b2496ed4e636062d8bb451e723b975c80920': SIP: convert enum to static final int.