Sync'd branch releases/aurora with upstream @ Tue Sep  2 05:14:35 PDT 2014