Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 11:38:39 PDT 2014