Sync'd branch releases/aurora with upstream @ Fri Oct  3 14:42:33 PDT 2014