Commit 2d2204b091d04e5584724d8c93effbbb4185e9a2

Con Kolivas 2013-11-12T17:29:30

merge upstream