Sync With Origin - 20141028

Sync With Origin - 20141028