merged master (2012-09-11)