Merge from master (polymer 0.1.1 support)