Sync'd branch releases/aurora with upstream @ Wed Nov 12 10:28:56 PST 2014