small update 2014.9.6
Merged master fixed conflict