Merge master_dev_20140811 to master