Sync'd branch releases/aurora with upstream @ Mon Sep  8 10:19:41 PDT 2014