Merge upstream changes from greese:develop [2014-06-06]