Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 06:33:38 PDT 2014