Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 22 14:38:37 PDT 2014