added changes from lib and nightly

merge changes from 2014-03-02 nightly build