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