update from master stream 

updates from master stream 2014/11/05