Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 06:33:32 PDT 2014