Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 18:18:34 PDT 2014