2014-07-30 | master changes I