Sync'd branch releases/aurora with upstream @ Tue Sep 16 12:55:32 PDT 2014