2014.11.30 (1.49n1)
2014.11.30 (1.49n3)
Merge upstream