merge frank branch 2014.11.14