Sync'd branch releases/aurora with upstream @ Tue Sep  2 15:47:33 PDT 2014