Merge from Google Drive

Merge from http://drive.google.com/folderview?id=0By17tSwoOOZWZGhYd21VSEdscE0&usp=sharing